2222

heweitykc · Aug 30, 2014 · bc241a8 · bc241a8
1 parent 953884d
commit bc241a8
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 53 deletions.
diff --git a/proj/generatefilelist/generatefilelist/drr_01.jpg.c3t b/proj/generatefilelist/generatefilelist/drr_01.jpg.c3t
diff --git a/proj/generatefilelist/generatefilelist/drr_02.jpg.c3t b/proj/generatefilelist/generatefilelist/drr_02.jpg.c3t
diff --git a/proj/generatefilelist/generatefilelist/drr_03.jpg.c3t b/proj/generatefilelist/generatefilelist/drr_03.jpg.c3t
diff --git a/proj/动画资源/UI/DemoHead_UI/DemoHead_UI.xml.ui b/proj/动画资源/UI/DemoHead_UI/DemoHead_UI.xml.ui
@@ -17,14 +17,7 @@
   <ProjectType>UIProject</ProjectType>
   <ResRelativePath />
   <imageFileList />
-  <imagePngList>
-    <string>BLOOD-1.png</string>
-    <string>hat01.png</string>
-    <string>hat.png</string>
-    <string>BLOOD-RED.png</string>
-    <string>BLOOD-BLUE.png</string>
-    <string>gun.png</string>
-  </imagePngList>
+  <imagePngList />
   <JsonSuffix>.json</JsonSuffix>
   <CurrentUIJson>DemoHead_UI.json</CurrentUIJson>
 </UIProject>
diff --git a/proj/动画资源/UI/DemoHead_UI/Json/DemoHead_UI.json b/proj/动画资源/UI/DemoHead_UI/Json/DemoHead_UI.json
@@ -10,15 +10,8 @@
   "designHeight": 320,
   "designWidth": 480,
   "textures": [],
-  "texturesPng": [
-    "BLOOD-1.png",
-    "hat01.png",
-    "hat.png",
-    "BLOOD-RED.png",
-    "BLOOD-BLUE.png",
-    "gun.png"
-  ],
-  "version": "1.4.0.1",
+  "texturesPng": [],
+  "version": "1.5.0.0",
   "widgetTree": {
     "classname": "Panel",
     "name": null,
@@ -516,7 +509,7 @@
       "classname": "Panel",
       "name": "Panel",
       "ZOrder": 0,
-      "actiontag": 1,
+      "actiontag": -1,
       "anchorPointX": 0,
       "anchorPointY": 0,
       "classType": "CocoStudio.EngineAdapterWrap.CSPanel",

diff --git a/proj/动画资源/cocos/isogrid.cpp b/proj/动画资源/cocos/isogrid.cpp
@@ -16,36 +16,35 @@ bool IsoGrid::init()
 	_cellSize = 10;
 
 	_slider1 = Slider::create();
+	_slider1->setRotation(90);
 	_slider1->loadBarTexture("ui/sliderTrack.png");
 	_slider1->loadSlidBallTextures("ui/sliderThumb.png", "ui/sliderThumb.png", "");
 	_slider1->loadProgressBarTexture("ui/sliderProgress.png");
-	_slider1->setPosition(Vec2(70, 300));
+	_slider1->setPosition(Vec2(10, 500));
 	addChild(_slider1);
 	_slider1->addEventListener(CC_CALLBACK_2(IsoGrid::sliderEvent1, this));
 	_slider1->setPercent(50);
 
 	_slider2 = Slider::create();
+	_slider2->setRotation(90);
 	_slider2->loadBarTexture("ui/sliderTrack.png");
 	_slider2->loadSlidBallTextures("ui/sliderThumb.png", "ui/sliderThumb.png", "");
 	_slider2->loadProgressBarTexture("ui/sliderProgress.png");
-	_slider2->setPosition(Vec2(70, 280));
+	_slider2->setPosition(Vec2(30, 500));
 	addChild(_slider2);
 	_slider2->addEventListener(CC_CALLBACK_2(IsoGrid::sliderEvent2, this));
 	_slider2->setPercent(50);
 
 	_slider3 = Slider::create();
+	_slider3->setRotation(90);
 	_slider3->loadBarTexture("ui/sliderTrack.png");
 	_slider3->loadSlidBallTextures("ui/sliderThumb.png", "ui/sliderThumb.png", "");
 	_slider3->loadProgressBarTexture("ui/sliderProgress.png");
-	_slider3->setPosition(Vec2(70, 260));
+	_slider3->setPosition(Vec2(50, 500));
 	addChild(_slider3);
 	_slider3->addEventListener(CC_CALLBACK_2(IsoGrid::sliderEvent3, this));
 	_slider3->setPercent(50);
 
-	_label = LabelTTF::create("Hello World", "Arial", 8);
-	_label->setPosition(100, 310);
-	addChild(_label);
-
 	_items[0] = GridItem::create();
 	addChild(_items[0]);
 	_items[1] = GridItem::create();
@@ -71,12 +70,15 @@ bool IsoGrid::onTouchBegan(Touch* touch, Event* event)
 {
 	Vec2 v2 = touch->getLocation();
 	v2 = this->convertToNodeSpace(v2);
-	char str0[256] = { 0 };
+
+	std::stringstream ss;
+	std::string str;
+
+	ss << "x=" << v2.x << ", y=" << v2.y << std::endl;;
+	ss >> str;
+	log(str.c_str());
 	Vec3 isop;
 	screen2iso(isop, Vec3(v2.x, v2.y, 0));
-	sprintf(str0, "x=%f,z=%f", round(isop.x), round(isop.z));
-	_label->setString(str0);
-
 	moveItem(0, isop.x, v2.y, isop.z);
 
 	return false;
@@ -169,16 +171,20 @@ void IsoGrid::redraw(float dt)
 			drawPoint(i, 0, j);
 		}
 	}
+
+	/*
 	char str0[256] = {0};
 	sprintf(str0, "xangle=%2f,yangle=%2f", _xangle, _yangle);
 	_label->setString(str0);
-
+	*/
 	moveItem(0, 0, 0, 0);
 	moveItem(1, 1, 0, 12);
 	moveItem(2, 2, 0, 12);
 	moveItem(3, 3, 0, 15);
 	moveItem(4, 4, 0, 12);
 	moveItem(5, 16, 0, 17);
+
+	CCNotificationCenter::sharedNotificationCenter()->postNotification("isogrid_resize", this);
 }
 
 void IsoGrid::iso2screen(Vec3& isoP, Vec3& screenP)

diff --git a/proj/动画资源/cocos/isogrid.h b/proj/动画资源/cocos/isogrid.h
@@ -40,7 +40,6 @@ class IsoGrid : public cocos2d::Layer
 	cocos2d::ui::Slider* _slider1;
 	cocos2d::ui::Slider* _slider2;
 	cocos2d::ui::Slider* _slider3;
-	cocos2d::LabelTTF* _label;
 	GridItem* _items[6];
 
 	bool onTouchBegan(cocos2d::Touch*, cocos2d::Event*);

diff --git a/proj/动画资源/cocos/road.cpp b/proj/动画资源/cocos/road.cpp
diff --git a/proj/动画资源/cocos/road.h b/proj/动画资源/cocos/road.h
diff --git a/proj/动画资源/地图/bg.jpg b/proj/动画资源/地图/bg.jpg